cleaning up and consolidating includes, removing markdown since it doesn't show up in pdfs