cleanup and removal of random stuff