cleanup and remove un-needed stuff