Eng 7060

Remove any commented used code.