Cleanup some warnings from committed file