cleanup from master and maps