Removing more nonsense