cleanup export and fields