Jp cleanup

Removing the terrible. Fixin' the problems. And the old merge conflicts.