Solution-wide code cleanup