Removed temporary statements accidentally left in