removed some unused lines