removed unused files
fixed scrutinizer warnings