Remove circular reference.
Upgrade rails 3.2.2