removed wierd stuff