Revert "The rest of compilations errors fixed"

This reverts commit e6c049a0dd8fecd422d8fd71d1621cfb28bbcba6.