HOPKINS: Remove a couple of useless variables and associated dead code