Cleaned up commands & permissions