Removed legacy code and resources