clean up jp references