Remove a few lines of code that were rendered obsolete after a design change