cleans up eav create logic