Got rid of excess, unused parts of the challenge.