Removed buggalo dependency