Preparing remove code to use tables