Revert "Few changes for now"

This reverts commit c38aec1fc2f8be6b823bc153f6346feb44333c55.