Remove commented test code and update code documentation. MJ-719 MJ-732