Clean up ibuffer and add vs integration