Cleanup. Ruby only