Revert "General commit"

This reverts commit bfe677b133ccb7051afca43b0089162aad7ff357.