NIBG-1272 changes

This file should not be here anymore