Commented out more unverified routines