Remove maps

I've removed maps from everywhere.