Removed non-class members