Cleaned up the backend sufficiently