NEXUS-6219: Minor changes, redundant checks