minor cleanup for merge