Clean up & Preparation for Nap

Clean up & Preparation for Nap