removed some things that should not be there