Superfluous imports removed