Got rid of random non-needed map