remove obsolete needle, cleanup