Bugs removal