Cleaned up clear-command