removed unused lines of code