Revert "Major fixes"

This reverts commit 5fa3441971bdb8025f5e20d84df9e23d40c6f75d.