cleanup dev commit into master