Removal of unnecessary class
Problem 9 and 10 commit