Fix bug in history, remove automatic cspm until bug is fixed