removed unneeded code and have all -l outputs correct