references cleaned up