Removed messy import code