More subjects + names in facts
Remove fact files