Merge from Tridge: remove redundant declarations