No need to keep old code commented out ... just remove it