Revert "add -t and other new options"

This reverts commit b0ce7bcd37c8af768aef78304e76df17b31d0ffb.