Some "bug" removal