Removed unused imports, further speeding things up