Alex/explore cleanup