Scrutinizer patch
Refactoring code by removing useless codes