removed redundant property
removed redundant property
removed dead code
Merge branch 'feature/cleanup1' into develop