Cale/xmodule assets fewer deletions

Depends on #185