[FIX] Remove all commented out lines