REFACTOR: removed support from codebase, support for mask=None (i.e mask is obligatory hencefort)
REFACTOR: various API cleanups