Reverts classmethods back to staticmethods