Few more comments, removed some old aliases