QA: Remove code not aiding readability