Minor changes/removal of unused procedure.