Remove dictionary and just pull values from object