Cleanup
Hotfix and cleanup