removed some detritus code