Cleanup .Net 4.0 to 4.5