Remove unused exception
Implement keep