Removing unused class