removed some files, deleted repeating typedef