Further cleanup of backend