Remove map stuff, add comic stuff