clean the maps at the end, but still have to fix tests by using fixtures
next
fixed that