Remove needless functions
Fix class name