Clean up default commands and models