no more split between backend and frontend
Cleanup