Shell, Filemap, etc deleted from branch