Issue #14 - removed cargo code