Use only one NameNode Executor

Remove code duplication/ Clean up logic