Pre-rake cleanup