Cleaned out some archival stuff. Removed the mask in out mode.