minor: whitespace
minor: removing dead code