Removed unnecessary imports, Code cleanup