Edits and clean

* removed signify due to slow down