cleanup Command interface, alpha ready