2928 removed old not needed cleanup function