Commented out, can it be safely removed?