I'm wary of merging commented out code. What's the plan for replacing this? Is replacing this the next immediate task?