Removed the old class. Updated TODOs and comments.