Master branch cleaned up

so we can merge it down