Obsolete references removed..