Removed unused files and folders
Merge branch 'development' into dev/j2/common