remove waterfall library
move read options into function way