Revert "Fixing some compiler warnings"

This reverts commit 501d93250ed5e382143b86d08a5f2a9852d1b5b3.