use master of gem
kill some dead code