removed unnecessary DelayElementLocation
general refactoring
Minor bug fix
Merge remote-tracking branch 'wakaleo/master' into web-element-facade-reconstruction