Removed unused class variables, minor cleanup