Cleanup (resharper)