Cleanup some un-used imports
Merge pull request #5242 from mixonic/metal-views-cleanup

Cleanup some un-used imports