In the spirit of cleanup, we should probably start resolving TODO comments and getting rid of old code in general.