delete obsolete declarations; add further functions