Clean up and separate the different types of prepared commands