Altered init to include remove