Get rid of stupid secondary map