cleanup, inicond
add mask "none" remove obsolete parameters + subdirs