Removed some unused imports
Minor code revisions