cleaned some structure up before push