Fix Wrong Comments Order

+ Fix empty custom file auto-remover.