Pot removed from controlled substance list under proposed legislation