Removed unused commands and finished