WIP associations cleanup