Removed unused configuration, added more aliases.