VID-1376 remove unused imports
remove unused imports and newlines on element dec