Commit code update to work with modified version of implementation.velocity
Cleaning obsolete code, add comments