Cleaning up exports and throws