Remove deprecated modules, optimise a little by assuming Give2LA options