Clean up the code
Merge branch 'develop' into KwaMoja-Medical