2. commit

Cleanup