clean up after manual merge with alex's version