Irrelevant imports removed