Remove the shell stuff, make objects mutable.