cleanup so I can merge with master