Revert "fix a few warnings"

This reverts commit 80e26708281dd4e4a0ebf9840b0ea518ef8155cd.