Should this be removed or uncommented out?