Removed obsolete methods, comments, logging