Simplify bytecode comparison by not using "dis"
Remove obsolete code