Delete commented out and replaced val code which has been unused for some time.