Removed silliness and toast redundancies.