Clean up unused imports.
Merge branch 'cleanup_included_items' into development