Took away unnecessary code