removed imageServer, closing branch