Commented out unneccessary code