Removing dependency from CGLib and adding Javassist