Removing static methods