removed some private stuff