Remove usage of ATTRIB()
#481
+129
−50
Merged
ATTRIB()
#481