Cleanup CrosscuttingConcerns solution