Rearranged world cleaning

- Extracted method
- No need for border null checking (it always returns border)
- Added paintings skipping