removal of custom code to use BCEL 5.2