fix attr nesting
remove unused constant