Cleaning up unused imports
Preparing for a more intelligent decision system