Cleanup, restore functionality