Old references cleaned up