Clean up blocks