#27 5. remove useless content and small fixes