removed a few unused lines