remove accidentally pasted code, minor cleanup

Signed-off-by: Christopher Hall <christopherhall.hsw@gmail.com>