Melissa/ui

"Remove commented out code"