cleaned up some unused pads and blocks