remove bindkey, clean up params

Change-Id: I787fe211b2bf8bf10401bcd58616582a1b678a52