Removal from MakeAPI. Also refactor our remove endpoint a smidge