fix quoting, remove redundant code

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>