remove usless aliases and cleanup mkpr function