v1.0 needs some cleaning