Still removing bugs