Fixed attr_* overrides
Clean up attr_* override module pollution