cleanup, loading the proper new stuff