Removed unused methods, added newline at end of file