changed format, remove unused commands