refactor and use ghost map

2 jobs for ci/cleanup in 15 minutes and 55 seconds (queued for 3 seconds)