re-export and cleanup of features