Working towards removing unneeded things.
Final patch.`
Merge branch 'dev'