Partial Clean Up