Remove aliases and don't export constructor