Cleanup block overrides and closes #6