fix to applies to needed and cleanup