Revert "Testing new removal/addition stuff"

This reverts commit 9b39137b04d3fafdfd0960c3bee84b530bda3e20.