Cleanup from movement of code to enterprise ed.