Made removeGroups
Finalized last changes
Merge pull request #247 from roydude/v1-train

v1train