Cahaba cleanup

by