Fixed some imports and removed unused ones