CLEANUP: Remove unused code