remove element id conflict, cleanup