Removing drama, removing some aliases