More Acer cleanups