Removed legacy code/comments