Best Approach For Citations & Clean Up?