Remove redundant/obsolete declarations