clean up of procedures, comment out but start generic methods.