Cleanup for Guides commands