Cleaning up code and setting Remove to disable instead of destroy.