Cleanup + remove superfluous command run