Cleanup, working random drop