BISERVER-10959 - Removing unncessary code