First clean up complete

First clean up complete

First clean up complete