Cleaned Code First Release