Demo 4.2 cleanup