Bukakkke cleanup