Removed velocity scripts now in java
Added mising changes from last commit