Removed some unused lines