visibility cleanup