(#9) remove questionable aspects