Slowly started working on the cleanup world files part

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>