Cleanup application pre hook
Migrate new command to new command structure