TD-3791 (Remove Commented code)

Completed for PsTool and OpenOffice Folder