Dropping the unnecessary dependency on apigen