FIX: Remove redundant code