more cleanning up