as @bebef1987 pointed out there are some unused lines commented throughout this pull, can you please remove them? Thanks