simple cleaning
wip Issue #25 (use Simple Multimedia extension)