Commit

Removed switch trim, killed JSON encoding