Removed BaseServerURL from everywhere