EUCA-9200, removing lifecycle artifacts left over in walrus