Clean up figures