removed unused func
add new properties default
Merge branch 'katana' into front-end