Revert "lots of changes"

This reverts commit 2024fd37727c5eb076378c0c43657f09d955c8dc.