removing a bunch of shit so that things will merge nice