remove prestart
Merge branch 'dev'