wip cleanup and beetles