Updated couple license headers, removed some junk files