fixed noLocationMismatch, removed some no longer needed methods