Remove unused file, fix various warnings