Remove some stuff.
Change  afew things