TODO: clean up some obsolete items