Clean up references to back-end