[ref_impl_eiffel] [1184] Further missed deletes/moves from last merge

Revision: 1184
Author: thomas.beale
Log Message: