removed some unused lines of code