cleaning up bugs