Cleanup for all cases

Merged Daniel Juarez requested to merge all_types_cleanup into master

Merge request reports