Merge with live code and clean up