Commented out extra code