Re-added laxika's command clean up