removed more unused lines of code