Removed external_command_buffer as well