Commit more cleanup