Removed some redundant and expensive imports