clean up and maps