re-enable service no parser + popup provider for token access + clean code