Redundant imports removed