Remove stack entries and rename to static