Removed redundant imports, etc.