Hotfix: Remove unwanted code from merge