Fixed remove item jumping to the wrong file.
And some lint.