removed a bit of excess stuff