More generic utilities for finding stuff

Cleanup