initial removal of readlink references for #23