Removing unecessary code and minor fixes

Signed-off-by: Renato Stoffalette Joao <renatosjoao@gmail.com>