More mining behavior cleanup