rename; remove redundant methods