Remove elevator TE + align to lib