HOTFIX: Remove commented code