WIP: Delete commented code from core