Consolidate aliases and remove rails helpers functions