Block class cleanup