remove unused aliases and better categorise them too