cleanup as visibility, hopefully?