Cleanup hotfix

Some cleanup :)