Small block clean out

Here ya go