First cut without license headers and junits