FIX: Remove unnecessary code