Cleaning up CmdBlockTools