Remove some of the debugging and fix the relationship problem.