Mayor plans to remove marijuana from city code