Marvin code
Revert "Marvin code"

This reverts commit 856675e417ea5fb4adc8dce2782053c2bff654da.