got removal working again, have to decouple some layout stuff