Revert "Just to get working version"

This reverts commit 77402fde8824b8f7048f6c5ded341b6dcb403d7c.