removed kiss metrics
fixed tests that failed after rebase, removed dead code