Remove redundant code from before I extracted it