Removed short versions of dynamics + misc