Clean web-dev branch, prep for test server branch