Moved SlapCommands to new command system
Removed old code & cleaned code