Added the beginnings of self cleanup