remove unused alias, + some paths changes