Added cleanUp optional arguments when removing a system.