Strip system properties as needed during CUD ops

update system property return logic

code review fixes

Address additional code review feedback

Fix bug in if statement, refactor added logic around

Add function documentation