Comment code in development and ajust for pass the build