Finish non-recursive loader
Delete unnecesary headers