Added Scrutinizer code quality badge + some unused code removal