Removed some imports and other fixes