small tweaks
deleted unused file
Merge remote-tracking branch 'origin/indev' into indev