[wip] Removed some un-needed commented out code