Cleaned up env.sh and database.sh settings files