First clean up

First clean up