Tidy up code, remove IntoPII related code