Added export all

Also removed some unused features