Got rid of redundant code that was redundant