Remove prototypical inheritance

Change-Id: I29bb78dda7f42b2fa1af2322bb87fa8feafa33a9