Remvoe bug hunting code