Revert "lots of stuff"

This reverts commit ded1ea22aaa575b405865e47b0eb7cb297094a1f.