Removed annoying class-level methods