Removed some functions that don't really belong in the class definition