removed the excess stuff...