Cleaned up master branch for installed use on ROCKY