Removed some unused imports and double checked it is all working