cleaning continued

missing things from last commit