Removed unneeded imports, methods and fields