Simple on/off functions for overlap remover
Merge branch 'overlap_remover' into develop