Prediction for Quicksand and deleted unused code
merged conflicts