[ecloud] Cleaning up bad code