Removed unecessary imports and commented code