FIX: Remove old code after rebase