Clean up a bit for shippin'