test -server option
remove unused fields
add @Wither xtend annotation
add target definition