Remove "locatorNoLine" erroneous call omitted in last commit + cleanup