More cleanup

Stil cleaning up git