remove & rearrange stuff for production