Hotfix removed leftover code