Fix lists and remove useless header