Modernize remaining systems