removing some server calls