Revert "Fixed various warnings"

This reverts commit 95666a613d599ac1213b7752be68605ab6d24c25.