Clean up of unneeded code or code that needs reworked