CLEANUP: Remove UNUSED code.