Hotfix: Installation cleanup, temporary

## Ready State: Yes