stripped work

got rid of a bunch of commented-out troubleshooting now that the
areas/features collections are working correctly