Removed Javassist dependency