cleaning for v0.4