REM: unneeded methods, constructors, variables, etc.
MOD: cleaned up code in general