Removed unecessary imports and variables