Remove redundant theming and style XML
Remove redundant code and clean up debug code