Cleanup of backend files. Probably still more to do.