Took out some nonsense