Continued cleanup of install steps