Removed some comments added during debugging