Cleaned up old code in Yale