WIP: clean up holds