Clean up backend a bit