Remove excess markup
Unused code