Removed the last command handlers
Refactoring
Updates and fixes