Various changes.
Merge branch 'development'
Remove some old files.
Merge branch 'development'