Removed a few aliases, for testing purposes