moved check up..

Signed-off-by: Mauro Scomparin <scompo@gmail.com>
removed refractored methods.

Signed-off-by: Mauro Scomparin <scompo@gmail.com>