Removing debug lines and commenting unfinished code