removed some unused lines#45