removing unused code, cleaning up, preparing for overhaul