Removing un-needed imports, closes #12