Preparing remove code to use tables - 2