Removed some class methods