Deleting resources not needed anymore
Misc code cleanup, all over the place