Removed export cruft