Do not depend on super
package cleanup