Fixed some weired copy from other files and removals2