Unused statements removed
Minor changes