Removed unneccessary imports and files