Cleaning vem

Related to tickets #72 and #73. I do not close the tickets because there is still work to do on these tickets.