Updated the flush methods to respect skip methods and made removeLocalOnly public