Cleanup, more advice from Rubenstein