Remove aliases and document new functions