Removed a few more unused lines