Fix: Removed code placed in wrong spot