Clean up SubClass.java