Fix sample offset index and remove commented code

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>