Removed "buggalo" dependency