All bugs removed