Questionable code cleanup