Remove some code acting on some older removed code