more server startup cleanup