Expanded cleanMap to replicate the clean up process I do locally