Removed unused parameters in model and predict