Remove attribute feature

Pull request should be ok now.