Improve ConsoleCommandHandler class and delete pointless stuff