scalability: clean up