Removal of defunct includes, modification of category edit pages