remove attribute_of
Merge remote-tracking branch 'arskom/master'