Remove mz types, comment cleanup