fix following global references
remove hash references