Remove extraneous code to improve readability

Have manually tested on Staging to confirm no regression