Remove double end doument
Some basic ideas for 1.4