Some cleanup in member controller