cleanup

Is the javassist dependency necessary?