Various changes including the removal of unwanted class files
Merge branch 'master' into develop