Build scripts cleanup