restore to only server code