Clean up General commands