NA - removed unused commented out code