another attempt to clean up the commits