*8674* Delete unused/duplicate code