Fixed commandhandler, removed old ones