Remove extraneous statements. Code cleanup.