yay for buggy block removal