clean up and remove obsolete