Move to running as root and general cleanup to facilitate running on CentOS