EMBRYO-40, EMBRYO-49, EMBRYO-28, EMBRYO-29: cleanup of dead code
EMBRYO-32: removed old Ship Entity
EMBRYO-28, EMBRYO-29: cleanup