Cleanup of custom cells