Commented out code no longer used