BISERVER-8088 - Removing unused imports