Clean up cruft

It's no longer necessary to keep these since they are not used after the
directory hacks were removed.