Small code cleanup on code about remote associations