Removed dependency from Javassist