removed uneeded options and flags, added TODO