Subclass cleanup