cleanup for merge with master