cleanup for software v1.0