cleanup of staled code