Remove all magic, require explicit commands