Remove bs optimization