More bytecode cleanup