Cleanup: removing unused class.