Remove unneeded code from several files
Merge branch 'master' into dev