[ Update ] Remove useless parts from Problem 7