Source reformat; remove unused variables