Remove extra spacejam dep, address more @cvrebert comments