add missing enforces + cleaning