Address comments and remove all traces of generate code