Clean up :lipstick: