removed some crap and prep for movement