unnecessary DOM element locating removed