clean up and hopefully commited