Cleanup organization views and de-BPT them