Minor improvements + deletions#552

replydev merged 2 commits intomainreplydev/cotp:mainfrom

chore/cleanupsreplydev/cotp:chore/cleanupsCopy head branch name to clipboard