Some content clean up thanks to fiona