remoe hash attributes (less magic) and make attributes on context explicit