clean up to regain functionality