Remove secrey base key
Update helpers