Got rid of unused ClassFactory.java