I know it's commented out anyway, but should this be removed?