Migrate to .Net 4.0. Clean up.