removed a couple of unused lines