Removed onDisable()