FIX: Clean up unnecessary lines