Removal of redundant xml

This is just to simplify for now, later on when we have a cohesive
design language we can add these back in