JBIDE-16943 - Removing unnecesary code