gn_ret removed, code cleaned