deleted more obsolete code from this patch