* removed some unnecessary functions and changed exports