adding some of cleanup from another branch #3

Closed seraphinatarrant closed 4 years ago