Clean up some gadgets