WIP finished remove/rename support