Cleanup: Remove unused class