Revert "Add system/extras"

This reverts commit a1b533602f27cdb8b5eb9840024431ff7bd8059d.