clean up metaclass changes