Cleanup: unused code removed
Cleanup: unused code removed