Cleanup some compilation warnings for unused import