clean up alignment and maps