Removing @staticmethod

I know I have more changes, but ... Oh come on!