cleanup / revert some stupid changes