Cleanup and add pads