Quickfix
Implement removal