Hotfix: Cleanup code