CLeanup and adding