Should these comments still be in here or is this forgotten debug code?