General cleanup and fancy blocks