Revert "short and long prediction with som"

This reverts commit ddace7c583c54685b562bb2452e7f045c883ca80.
Update