Remove old files that are not needed

Signed-off-by: martin f. krafft <madduck@madduck.net>
Handle merging None into lists/dicts

Signed-off-by: martin f. krafft <madduck@madduck.net>