Trying to clean up install process