preparations for dynamic options; removed some unused typedefs
preparations for dynamic options; removed some unused typedefs

mrvon/eris,asiekierka/eris,mrvon/eris,asiekierka/eris,yksalun/eris,yksalun/eris