PHOT-46:  remove unused imports and exclude packages