Proper Clean Up