resumed development: cleanup