Revert "Fixed a few comilation warnings"

This reverts commit 0390e6f6714ad33524ac3d96210268e272516b29.