Template edits
More removal of outdated elements