Took out some aliases