Clean up debug statements
Merge branch 'develop' of github.com:MicrosmartSA/ubiquity-ui into develop