cleaning up for merge with master