take out a couple things for merging to master