a bit of server side cleaning