Revert "Start reworking on refactoring code acc. to szezso's commits"

This is breaking build, not exactly what we want, as of now.

This reverts commit 6c4d9d8ff1c7471f1ebba8cb3b0639b08ce8b38e.
Reduce logs for now. we're past the null alloc errors