Failed previous commit, this commit fixes that. Also removed clear shortcut – duplicating functionality of toggle.