clean up
EVU-95 forgot to return a map