merge in fixes and remove unneeded files