Merge pull request #696 from SamWhited/development

Remove broken / unused imports