Updated to 7.3 era and made some small cleanup