Removed debugging place-holders