JASCIS-87: Remove unused imports