Removing data and fixing bugs