Add delete methods
Condense API a bit