Removed dead code, and others fixes por code inspector