Removed unused includes and superfluous semicolons.