Remove obsolete method
Simplify attribute class