Cleaning up, added new server to webapp