Various changes including the removal of unwanted class files