deleted file
remove comment code
Merge remote-tracking branch 'origin/WithoutModel' into WithoutModel
fixed bugs from ui changes