removed some unnecessary functions